diff options
| author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2022-11-29 05:20:04 +0100 |
|---|---|---|
| committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2022-11-29 05:21:14 +0100 |
| commit | 0941ae0b617839a724a62c0a69914686e81f053f (patch) | |
| tree | 28c379025386165643e3d9677f29ff13ff4b6d47 | |
| parent | CMakeLists: Bump minimum required CMake version to 3.22 (diff) | |
| download | yuzu-0941ae0b617839a724a62c0a69914686e81f053f.tar yuzu-0941ae0b617839a724a62c0a69914686e81f053f.tar.gz yuzu-0941ae0b617839a724a62c0a69914686e81f053f.tar.bz2 yuzu-0941ae0b617839a724a62c0a69914686e81f053f.tar.lz yuzu-0941ae0b617839a724a62c0a69914686e81f053f.tar.xz yuzu-0941ae0b617839a724a62c0a69914686e81f053f.tar.zst yuzu-0941ae0b617839a724a62c0a69914686e81f053f.zip | |
| -rw-r--r-- | externals/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/audio_core/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/input_common/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 6 |
4 files changed, 15 insertions, 4 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index d807ef65f..9740e017c 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -69,7 +69,6 @@ if (YUZU_USE_EXTERNAL_SDL2) set(SDL_SHARED OFF) add_subdirectory(SDL EXCLUDE_FROM_ALL) - add_library(SDL2 ALIAS SDL2-static) endif() # ENet diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt index 8e3a8f5a8..75416c53a 100644 --- a/src/audio_core/CMakeLists.txt +++ b/src/audio_core/CMakeLists.txt @@ -226,6 +226,10 @@ if(ENABLE_CUBEB) target_compile_definitions(audio_core PRIVATE -DHAVE_CUBEB=1) endif() if(ENABLE_SDL2) - target_link_libraries(audio_core PRIVATE SDL2) + if (YUZU_USE_EXTERNAL_SDL2) + target_link_libraries(audio_core PRIVATE SDL2-static) + else() + target_link_libraries(audio_core PRIVATE SDL2) + endif() target_compile_definitions(audio_core PRIVATE HAVE_SDL2) endif() diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index cc6f0ffc0..193127d0a 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt @@ -55,7 +55,11 @@ if (ENABLE_SDL2) drivers/sdl_driver.cpp drivers/sdl_driver.h ) - target_link_libraries(input_common PRIVATE SDL2) + if (YUZU_USE_EXTERNAL_SDL2) + target_link_libraries(input_common PRIVATE SDL2-static) + else() + target_link_libraries(input_common PRIVATE SDL2) + endif() target_compile_definitions(input_common PRIVATE HAVE_SDL2) endif() diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 0aa109dd3..060de0259 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -387,7 +387,11 @@ if (YUZU_USE_BUNDLED_QT AND QT_VERSION VERSION_LESS 6) endif() if (ENABLE_SDL2) - target_link_libraries(yuzu PRIVATE SDL2) + if (YUZU_USE_EXTERNAL_SDL2) + target_link_libraries(yuzu PRIVATE SDL2-static) + else() + target_link_libraries(yuzu PRIVATE SDL2) + endif() target_compile_definitions(yuzu PRIVATE HAVE_SDL2) endif() |